diff --git a/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml b/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml index b4b7bb2..521df5c 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml +++ b/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml @@ -18,89 +18,126 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.LeudaemiaLikeMe"> - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/AboutActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/AboutActivity.java index ee14577..06962e0 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/AboutActivity.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/AboutActivity.java @@ -1,14 +1,25 @@ package com.example.leudaemialikeme.Activity; import android.os.Bundle; +import android.view.View; +import android.widget.ImageView; import com.example.leudaemialikeme.R; public class AboutActivity extends BaseActivity { + ImageView about_back; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_about); + about_back=findViewById(R.id.about_back); + about_back.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); } } diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/AddEventActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/AddEventActivity.java index 3473834..3afd564 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/AddEventActivity.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/AddEventActivity.java @@ -1,16 +1,14 @@ package com.example.leudaemialikeme.Activity; -import androidx.appcompat.app.AppCompatActivity; - import android.app.Activity; import android.app.DatePickerDialog; import android.app.TimePickerDialog; import android.content.Intent; import android.os.Bundle; import android.view.View; -import android.widget.Button; import android.widget.DatePicker; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.TextView; import android.widget.TimePicker; import android.widget.Toast; @@ -40,7 +38,8 @@ public class AddEventActivity extends BaseActivity { private String show_event_day,show_event_month,show_event_info; private String show_event_place,show_event_doctor_name,show_event_time,show_event_create_time; private ImageView delete,save; - private Button add_date,add_time; + private LinearLayout add_date,add_time; +// private Button add_time; private ImageView back; DateFormat format= DateFormat.getDateTimeInstance(); diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/AttentionActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/AttentionActivity.java index d384583..090cb9e 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/AttentionActivity.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/AttentionActivity.java @@ -1,6 +1,8 @@ package com.example.leudaemialikeme.Activity; import android.os.Bundle; +import android.view.View; +import android.widget.ImageView; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -14,6 +16,7 @@ import java.util.List; public class AttentionActivity extends BaseActivity { + private ImageView attention_back; private List attentionList = new ArrayList<>(); @Override @@ -21,6 +24,17 @@ public class AttentionActivity extends BaseActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_attention); getData();//获得数据 + + attention_back=findViewById(R.id.attention_back); + attention_back.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + + + RecyclerView recycleView = (RecyclerView) findViewById(R.id.attentionList);//获得视图 LinearLayoutManager layoutManager; layoutManager = new LinearLayoutManager(this); @@ -34,6 +48,5 @@ public class AttentionActivity extends BaseActivity { attentionList.add(attention1); Attention attention2 = new Attention(R.mipmap.img_my_person,"小白帮","管住嘴，多饮水，常保暖"); attentionList.add(attention2); - } } diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/BaseActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/BaseActivity.java index c7612f4..d10cd15 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/BaseActivity.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/BaseActivity.java @@ -31,7 +31,7 @@ public class BaseActivity extends AppCompatActivity { public static Owner owner; //服务器链接 - public static String SERVER_IP = "172.18.138.225"; + public static String SERVER_IP = "172.30.112.86"; // 172.30.118.24 寝：172.18.138.225 // static { diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/MyInfoActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/MyInfoActivity.java index 68ba609..83f72fc 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/MyInfoActivity.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/MyInfoActivity.java @@ -8,6 +8,7 @@ import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.EditText; +import android.widget.ImageView; import android.widget.Spinner; import android.widget.TextView; import android.widget.Toast; @@ -33,6 +34,7 @@ public class MyInfoActivity extends BaseActivity { private Button commit; private Spinner spinner_sex; private String toast_content; + private ImageView my_info_back; @Override protected void onCreate(Bundle savedInstanceState) { @@ -89,6 +91,7 @@ public class MyInfoActivity extends BaseActivity { if(!ch_user.getSex().equals(origin_user.getSex())) toast_content =toast_content +"性别修改成功\n"; origin_user=ch_user; + changed_user=ch_user; runOnUiThread(new Runnable() { @Override public void run() { @@ -107,6 +110,14 @@ public class MyInfoActivity extends BaseActivity { } }); + my_info_back.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); + + } @@ -119,6 +130,7 @@ public class MyInfoActivity extends BaseActivity { edit_phone=(EditText)findViewById(R.id.my_info_phone); spinner_sex=(Spinner)findViewById(R.id.my_info_sex); commit=(Button)findViewById(R.id.my_info_commit); + my_info_back=(ImageView)findViewById(R.id.my_info_back); } private void initData(){ @@ -151,4 +163,5 @@ public class MyInfoActivity extends BaseActivity { } }); } + } \ No newline at end of file diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SafetyActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SafetyActivity.java index 819450a..f4af644 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SafetyActivity.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SafetyActivity.java @@ -1,14 +1,26 @@ package com.example.leudaemialikeme.Activity; import android.os.Bundle; +import android.view.View; +import android.widget.ImageView; import com.example.leudaemialikeme.R; public class SafetyActivity extends BaseActivity { + private ImageView safety_back; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_safety); + + safety_back=(ImageView)findViewById(R.id.safety_back); + safety_back.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); } } diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendInvitationActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendInvitationActivity.java index 3dc95d0..c09d9ff 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendInvitationActivity.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendInvitationActivity.java @@ -13,7 +13,6 @@ import android.widget.Toast; import com.example.leudaemialikeme.Dao.InvitationDao; import com.example.leudaemialikeme.R; -import com.example.leudaemialikeme.Utils.Data; import com.example.leudaemialikeme.Utils.OkHttpUtil; import java.text.SimpleDateFormat; @@ -68,7 +67,6 @@ public class SendInvitationActivity extends BaseActivity { SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()); String time = sdf.format(timeCurrent); Log.e("输入的time:", time); - Data app = (Data)getApplication(); Map paramMap = new HashMap(); paramMap.put("uid",String.valueOf(BaseActivity.owner.getNetId()));//需要获取登录用户的id paramMap.put("btype",type); @@ -80,6 +78,7 @@ public class SendInvitationActivity extends BaseActivity { paramMap.put("bbrowse",String.valueOf(0)); paramMap.put("flag",String.valueOf(0)); sendInvitationRequest(paramMap); + } } }); @@ -111,6 +110,7 @@ public class SendInvitationActivity extends BaseActivity { if (jsonStr.contains("success")){ Toast.makeText(SendInvitationActivity.this, "提交成功",Toast.LENGTH_SHORT).show(); + finish(); }else{ Toast.makeText(SendInvitationActivity.this, "帖子提交失败,请检查您的网络状况",Toast.LENGTH_SHORT).show(); diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendQuestionActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendQuestionActivity.java index 1e9b0c9..e97837e 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendQuestionActivity.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendQuestionActivity.java @@ -11,7 +11,6 @@ import android.widget.Toast; import com.example.leudaemialikeme.Dao.QuestionDao; import com.example.leudaemialikeme.R; -import com.example.leudaemialikeme.Utils.Data; import com.example.leudaemialikeme.Utils.OkHttpUtil; import java.text.SimpleDateFormat; @@ -66,7 +65,6 @@ public class SendQuestionActivity extends BaseActivity { String time = sdf.format(timeCurrent); // Log.e("输入的time:", time); Map paramMap = new HashMap(); - Data app = (Data)getApplication(); paramMap.put("uid",String.valueOf(BaseActivity.owner.getNetId())); // 需要获取登陆用户的id：需改 @@ -84,7 +82,6 @@ public class SendQuestionActivity extends BaseActivity { paramMap.put("qbrowseNum",String.valueOf(0)); paramMap.put("flag",String.valueOf(0)); sendQuestionRequest(paramMap); - } } }); @@ -120,6 +117,7 @@ public class SendQuestionActivity extends BaseActivity { if (jsonStr.contains("success")){ Toast.makeText(SendQuestionActivity.this, "提交成功",Toast.LENGTH_SHORT).show(); + finish(); }else{ Toast.makeText(SendQuestionActivity.this, "问题提交失败,请检查您的网络状况", Toast.LENGTH_SHORT).show(); diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SplashActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SplashActivity.java new file mode 100644 index 0000000..9b967a5 --- /dev/null +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SplashActivity.java @@ -0,0 +1,29 @@ +package com.example.leudaemialikeme.Activity; + +import android.content.Intent; +import android.os.Bundle; +import android.os.Handler; +import android.util.Log; + +import androidx.appcompat.app.AppCompatActivity; + +import com.example.leudaemialikeme.R; + +public class SplashActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_splash); + new Handler().postDelayed(new Runnable() { + @Override + public void run() { + Log.e("splash","开始跳转"); + Intent mainIntent = new Intent(SplashActivity.this, LoginActivity.class); + startActivity(mainIntent); + Log.e("splash","跳转下一页面"); + finish(); + } + }, 1900); + } +} \ No newline at end of file diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/HistoryPageFragmentAdapter.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/HistoryPageFragmentAdapter.java index 7b80937..005b7bf 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/HistoryPageFragmentAdapter.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Adapter/HistoryPageFragmentAdapter.java @@ -20,11 +20,11 @@ public class HistoryPageFragmentAdapter extends FragmentPagerAdapter { @Override public Fragment getItem(int idx) { String collectCategoryTitle = channelList[idx]; - if(collectCategoryTitle.equals(" 资讯 ")) + if(collectCategoryTitle.equals(" 资讯 ")) { return NewsHistoryFragment.newInstance(collectCategoryTitle); } - else if(collectCategoryTitle.equals(" 问题 ")){ + else if(collectCategoryTitle.equals(" 问题 ")){ return QuestionHistoryFragment.newInstance(collectCategoryTitle); }else{ return BlogHistoryFragment.newInstance(collectCategoryTitle); diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/CollectFragment.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/CollectFragment.java index 9e5d35c..4125357 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/CollectFragment.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/CollectFragment.java @@ -30,7 +30,7 @@ public class CollectFragment extends Fragment implements ViewPager.OnPageChangeL private ViewPager viewPager; //内导航的碎片的容器 private RadioGroup rgChannelCollect=null; // 内导航由单选按钮组构成 private HorizontalScrollView hvChannelCollect=null; //单选按钮组可滚动动 - private String[] channelList = {" 资讯 "," 帖子 ", + private String[] channelList = {" 帖子 " }; //默认的内导航栏目 private CollectPageFragmentAdapter adapter; //viewPager 的适配器 private TextView Name; diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/HistoryFragment.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/HistoryFragment.java index 28ae30a..5bb3e77 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/HistoryFragment.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/HistoryFragment.java @@ -26,7 +26,7 @@ public class HistoryFragment extends Fragment implements ViewPager.OnPageChangeL private ViewPager viewPager; //内导航的碎片的容器 private RadioGroup rgChannelCollect=null; // 内导航由单选按钮组构成 private HorizontalScrollView hvChannelCollect=null; //单选按钮组可滚动动 - private String[] channelList = {" 资讯 "," 问题 "," 帖子 " + private String[] channelList = {" 资讯 "," 问题 "," 帖子 " }; //默认的内导航栏目 private HistoryPageFragmentAdapter adapter; //viewPager 的适配器 private TextView Name; diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MessageChannelFragment.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MessageChannelFragment.java index c69fc42..df08f27 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MessageChannelFragment.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MessageChannelFragment.java @@ -66,7 +66,7 @@ public class MessageChannelFragment extends Fragment { } else if (messageCategoryTitle.equals(" 评论 ")) { view = inflater.inflate(R.layout.fragment_comment, container, false); - } else if (messageCategoryTitle.equals(" 赞 ")) { + } else if (messageCategoryTitle.equals(" 收藏 ")) { view = inflater.inflate(R.layout.fragment_nice, container, false); } else if (messageCategoryTitle.equals(" 粉丝 ")) { view = inflater.inflate(R.layout.fragment_fans, container, false); diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MessageFragment.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MessageFragment.java index 72ab913..7bfcc95 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MessageFragment.java +++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MessageFragment.java @@ -24,7 +24,7 @@ public class MessageFragment extends Fragment implements ViewPager.OnPageChangeL private RadioGroup rgChannel=null; // 内导航由单选按钮组构成 private HorizontalScrollView hvChannel=null; //单选按钮组可滚动动 private String[] channelList = {" 私信 "," 评论 ", - " 赞 "," 粉丝 "}; //默认的内导航栏目 + " 收藏 "," 粉丝 "}; //默认的内导航栏目 private MessagePageFragmentAdapter adapter; //viewPager 的适配器 public MessageFragment() { diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/drawable/about_logo.png b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/about_logo.png new file mode 100644 index 0000000..f80f4cd Binary files /dev/null and b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/about_logo.png differ diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/drawable/about_logov2.png b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/about_logov2.png new file mode 100644 index 0000000..799ba2e Binary files /dev/null and b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/about_logov2.png differ diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/drawable/button_set_clock_time.xml b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/button_set_clock_time.xml new file mode 100644 index 0000000..9dbe82e --- /dev/null +++ b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/button_set_clock_time.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/drawable/chat_send.xml b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/chat_send.xml new file mode 100644 index 0000000..dec73ea --- /dev/null +++ b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/chat_send.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/drawable/clock_commit.png b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/clock_commit.png new file mode 100644 index 0000000..36251d5 Binary files /dev/null and b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/clock_commit.png differ diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/drawable/down.png b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/down.png new file mode 100644 index 0000000..930c76d Binary files /dev/null and b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/down.png differ diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/drawable/find_new_user.png b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/find_new_user.png new file mode 100644 index 0000000..26da9e0 Binary files /dev/null and b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/find_new_user.png differ diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/drawable/read_already.png b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/read_already.png new file mode 100644 index 0000000..dfe1964 Binary files /dev/null and b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/read_already.png differ diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/drawable/read_already_v3.png b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/read_already_v3.png new file mode 100644 index 0000000..883a8f7 Binary files /dev/null and b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/read_already_v3.png differ diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/drawable/shape_corner_add_clock.xml b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/shape_corner_add_clock.xml new file mode 100644 index 0000000..f1ca6ac --- /dev/null +++ b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/shape_corner_add_clock.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/drawable/shape_round_corner_my.xml b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/shape_round_corner_my.xml new file mode 100644 index 0000000..0229f6a --- /dev/null +++ b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/shape_round_corner_my.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/drawable/splash_background.jpg b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/splash_background.jpg new file mode 100644 index 0000000..61c3142 Binary files /dev/null and b/Code/LeudaemiaLikeMe/app/src/main/res/drawable/splash_background.jpg differ diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_about.xml b/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_about.xml index 26dcd96..7d88b47 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_about.xml +++ b/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_about.xml @@ -10,31 +10,47 @@ - - + android:background="@color/white" + android:orientation="vertical"> - + android:layout_marginTop="15dp" + android:layout_marginBottom="15dp" + android:background="@color/white" + android:orientation="horizontal"> + + + + + + + + + android:layout_marginTop="150dp" + android:orientation="vertical"> - + - + + diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_add_clock.xml b/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_add_clock.xml index 8123a84..b8230ae 100644 --- a/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_add_clock.xml +++ b/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_add_clock.xml @@ -4,110 +4,173 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@drawable/background" android:orientation="vertical" tools:context=".ClockDetail"> - + + + android:layout_marginTop="15dp" + android:layout_marginBottom="15dp" + android:background="@color/white" + android:orientation="horizontal"> + + + + + +