Owner csj (#38)

* Develop (#36) * Develop (#30) * Develop (#25) * fix:color (#23) Signed-off-by: feaaaaaa <409834725@qq.com> * docs (#24) * fix:color Signed-off-by: feaaaaaa <409834725@qq.com> * docs Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com> * Owner feax (#28) * fix:color Signed-off-by: feaaaaaa <409834725@qq.com> * docs * feat:pieChart Signed-off-by: feaaaaaa <409834725@qq.com> * feat:barChart Signed-off-by: feaaaaaa <409834725@qq.com> * fix: standardise id of textView Signed-off-by: feaaaaaa <409834725@qq.com> * feat: switch button for statistic Signed-off-by: feaaaaaa <409834725@qq.com> * style: color Signed-off-by: feaaaaaa <409834725@qq.com> * feat: setting and about page (#27) Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com> Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com> Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com> * fix: string Signed-off-by: feaaaaaa <409834725@qq.com> * feat: navigation between statistic Signed-off-by: feaaaaaa <409834725@qq.com> * fix Signed-off-by: feaaaaaa <409834725@qq.com> * Owner csj (#33) * Develop (#29) * fix:color (#23) Signed-off-by: feaaaaaa <409834725@qq.com> * docs (#24) * fix:color Signed-off-by: feaaaaaa <409834725@qq.com> * docs * Owner feax (#28) * fix:color Signed-off-by: feaaaaaa <409834725@qq.com> * docs * feat:pieChart Signed-off-by: feaaaaaa <409834725@qq.com> * feat:barChart Signed-off-by: feaaaaaa <409834725@qq.com> * fix: standardise id of textView Signed-off-by: feaaaaaa <409834725@qq.com> * feat: switch button for statistic Signed-off-by: feaaaaaa <409834725@qq.com> * style: color Signed-off-by: feaaaaaa <409834725@qq.com> * feat: setting and about page (#27) Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com> Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com> Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com> * fix:screen saver activity * feat:calculate game Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com> Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com> Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com> * Owner yyc (#32) * feat: setting and about page * feat: two game added * feat: two pages added Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com> Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com> * Owner feax (#35) * Develop (#34) * feat：navigation&jump&color (#31) * Develop (#30) * Develop (#25) * fix:color (#23) Signed-off-by: feaaaaaa <409834725@qq.com> * docs (#24) * fix:color Signed-off-by: feaaaaaa <409834725@qq.com> * docs Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com> * Owner feax (#28) * fix:color Signed-off-by: feaaaaaa <409834725@qq.com> * docs * feat:pieChart Signed-off-by: feaaaaaa <409834725@qq.com> * feat:barChart Signed-off-by: feaaaaaa <409834725@qq.com> * fix: standardise id of textView Signed-off-by: feaaaaaa <409834725@qq.com> * feat: switch button for statistic Signed-off-by: feaaaaaa <409834725@qq.com> * style: color Signed-off-by: feaaaaaa <409834725@qq.com> * feat: setting and about page (#27) Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com> Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com> Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com> * fix: string Signed-off-by: feaaaaaa <409834725@qq.com> * feat: navigation between statistic Signed-off-by: feaaaaaa <409834725@qq.com> * fix Signed-off-by: feaaaaaa <409834725@qq.com> Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com> Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com> * Owner csj (#33) * Develop (#29) * fix:color (#23) Signed-off-by: feaaaaaa <409834725@qq.com> * docs (#24) * fix:color Signed-off-by: feaaaaaa <409834725@qq.com> * docs * Owner feax (#28) * fix:color Signed-off-by: feaaaaaa <409834725@qq.com> * docs * feat:pieChart Signed-off-by: feaaaaaa <409834725@qq.com> * feat:barChart Signed-off-by: feaaaaaa <409834725@qq.com> * fix: standardise id of textView Signed-off-by: feaaaaaa <409834725@qq.com> * feat: switch button for statistic Signed-off-by: feaaaaaa <409834725@qq.com> * style: color Signed-off-by: feaaaaaa <409834725@qq.com> * feat: setting and about page (#27) Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com> Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com> Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com> * fix:screen saver activity * feat:calculate game Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com> Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com> Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com> * Owner yyc (#32) * feat: setting and about page * feat: two game added * feat: two pages added Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com> Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com> Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com> Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com> Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com> * fix:merge Signed-off-by: feaaaaaa <409834725@qq.com> * feat:float button Signed-off-by: feaaaaaa <409834725@qq.com> * fix:adjust jump Signed-off-by: feaaaaaa <409834725@qq.com> * fix:adjust jump Signed-off-by: feaaaaaa <409834725@qq.com> Co-authored-by: Cui Shaojie <46640505+cui-shaojie@users.noreply.github.com> Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com> Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com> Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com> Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com> Co-authored-by: feaaaaaa <409834725@qq.com> Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com> * feat:pomodoro list * fix * fix:app name * fix * apk * fix Co-authored-by: feax <48175749+feaaaaaa@users.noreply.github.com> Co-authored-by: mark-yyc <61784497+mark-yyc@users.noreply.github.com> Co-authored-by: feaaaaaa <409834725@qq.com> Co-authored-by: August <46640505+ShaoJieCui@users.noreply.github.com>
o-ligei · Oct 9, 2020 · e81c222 · e81c222
1 parent 978ce5e
commit e81c222
Show file tree

Hide file tree

Showing 18 changed files with 298 additions and 63 deletions.
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.example.wowtime",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "properties": [],
+      "versionCode": 1,
+      "versionName": "1.0",
+      "enabled": true,
+      "outputFile": "app-release.apk"
+    }
+  ]
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -47,7 +47,7 @@
         <activity android:name=".StatisticActivity" />
         <activity
             android:name=".MainActivity"
-            android:label="111"
+            android:label="@string/app_name"
             android:launchMode="singleInstance"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>

diff --git a/app/src/main/java/com/example/wowtime/LoginActivity1.java b/app/src/main/java/com/example/wowtime/LoginActivity1.java
@@ -17,7 +17,7 @@ protected void onCreate(Bundle savedInstanceState) {
         usePasswordTextView.setOnClickListener(v -> startActivity(new Intent(LoginActivity1.this, LoginActivity2.class)));
         TextView useRegisterTextView = findViewById(R.id.textView5);
         useRegisterTextView.setOnClickListener(v -> startActivity(new Intent(LoginActivity1.this, RegisterActivity.class)));
-        Button login = findViewById(R.id.button6);
-        login.setOnClickListener(v -> startActivity(new Intent(LoginActivity1.this, PersonInfo.class)));
+//        Button login = findViewById(R.id.button6);
+//        login.setOnClickListener(v -> startActivity(new Intent(LoginActivity1.this, PersonInfo.class)));
     }
 }
diff --git a/app/src/main/java/com/example/wowtime/PersonInfoDetail.java b/app/src/main/java/com/example/wowtime/PersonInfoDetail.java
@@ -3,8 +3,10 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.fragment.app.Fragment;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -25,6 +27,10 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.activity_person_info_detail, container, false);
+        View root = inflater.inflate(R.layout.activity_person_info_detail, container, false);
+        ConstraintLayout constraintLayout = root.findViewById(R.id.CreditLayout);
+        constraintLayout.setOnClickListener(v -> startActivity(new Intent(getActivity(),CreditDetailList.class)));
+        return root;
     }
+
 }
diff --git a/app/src/main/java/com/example/wowtime/PomodoroListFragment.java b/app/src/main/java/com/example/wowtime/PomodoroListFragment.java
@@ -0,0 +1,76 @@
+package com.example.wowtime;
+
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ListView;
+
+import com.example.wowtime.adapter.PomodoroItemAdapter;
+import com.example.wowtime.component.PomodoroListItem;
+
+import java.util.ArrayList;
+
+/**
+ * A simple {@link Fragment} subclass.
+ * create an instance of this fragment.
+ */
+public class PomodoroListFragment extends Fragment {
+
+//    // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
+//    private static final String ARG_PARAM1 = "param1";
+//    private static final String ARG_PARAM2 = "param2";
+//
+//    private String mParam1;
+//    private String mParam2;
+
+    public PomodoroListFragment() {}
+
+    public PomodoroListFragment(int contentLayoutId) {
+        super(contentLayoutId);
+    }
+
+//
+//    /**
+//     * Use this factory method to create a new instance of
+//     * this fragment using the provided parameters.
+//     *
+//     * @param param1 Parameter 1.
+//     * @param param2 Parameter 2.
+//     * @return A new instance of fragment PomodoroListFragment.
+//     */
+//    public static PomodoroListFragment newInstance(String param1, String param2) {
+//        PomodoroListFragment fragment = new PomodoroListFragment();
+//        Bundle args = new Bundle();
+//        args.putString(ARG_PARAM1, param1);
+//        args.putString(ARG_PARAM2, param2);
+//        fragment.setArguments(args);
+//        return fragment;
+//    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater,@Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_pomodoro_list, container, false);
+        ArrayList<PomodoroListItem> list = new ArrayList<>();
+        list.add(new PomodoroListItem("ICS","30min"));
+        list.add(new PomodoroListItem("CSE","60min"));
+
+        PomodoroItemAdapter adapter = new PomodoroItemAdapter(list,getContext());
+        ListView listView = view.findViewById(R.id.PomodoroCardList);
+        listView.setAdapter(adapter);
+
+        return view;
+    }
+}
diff --git a/app/src/main/java/com/example/wowtime/adapter/PomodoroItemAdapter.java b/app/src/main/java/com/example/wowtime/adapter/PomodoroItemAdapter.java
@@ -0,0 +1,55 @@
+package com.example.wowtime.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 com.example.wowtime.R;
+import com.example.wowtime.component.AlarmListItem;
+import com.example.wowtime.component.PomodoroListItem;
+
+import java.util.ArrayList;
+
+public class PomodoroItemAdapter extends BaseAdapter {
+    private ArrayList<PomodoroListItem> mData;
+    private Context mContext;
+
+    public PomodoroItemAdapter(ArrayList<PomodoroListItem> mData, Context mContext) {
+
+        this.mData = mData;
+        this.mContext = mContext;
+    }
+
+    @Override
+    public int getCount() {
+        return mData.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return null;
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @SuppressLint("ViewHolder")
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+
+        convertView = LayoutInflater.from(mContext).inflate(R.layout.pomodoro_list_item,parent,false);
+
+        TextView txt_name = (TextView) convertView.findViewById(R.id.PomodoroName);
+        TextView txt_gap = (TextView) convertView.findViewById(R.id.PomodoroGap);
+        txt_name.setText(mData.get(position).getName());
+        txt_gap.setText(mData.get(position).getGap());
+
+        return convertView;
+    }
+}
diff --git a/app/src/main/java/com/example/wowtime/component/PomodoroListItem.java b/app/src/main/java/com/example/wowtime/component/PomodoroListItem.java
@@ -0,0 +1,20 @@
+package com.example.wowtime.component;
+
+public class PomodoroListItem {
+    private String name;
+    private String gap;
+
+    public PomodoroListItem(){}
+
+    public PomodoroListItem(String name,String gap){
+        this.name = name;
+        this.gap = gap;
+    }
+
+    public String getName(){return name;}
+    public void setName(String name){this.name = name;}
+
+    public String getGap(){return gap;}
+    public void setGap(String gap){this.gap = gap;}
+
+}
diff --git a/app/src/main/res/layout/activity_clock_setting.xml b/app/src/main/res/layout/activity_clock_setting.xml
@@ -65,7 +65,6 @@
             android:id="@+id/timePicker"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="32dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 

diff --git a/app/src/main/res/layout/activity_person_info_detail.xml b/app/src/main/res/layout/activity_person_info_detail.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/lightPink"
+    android:clickable="true"
     tools:context=".PersonInfoDetail">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -41,8 +42,8 @@
         android:id="@+id/Layout2"
         android:layout_width="0dp"
         android:layout_height="489dp"
-        android:layout_marginTop="12dp"
         android:layout_marginStart="32dp"
+        android:layout_marginTop="12dp"
         android:layout_marginEnd="32dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
@@ -218,6 +219,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
+            android:clickable="false"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/GenderLayout">

diff --git a/app/src/main/res/layout/activity_statistic.xml b/app/src/main/res/layout/activity_statistic.xml
@@ -62,34 +62,8 @@
         android:text=""
         android:textSize="16sp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        android:layout_marginBottom="330dp"
-        android:layout_marginLeft="300dp"
-        android:layout_marginRight="20dp"
-        tools:ignore="MissingConstraints">
-
-        <RadioButton
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:text="@string/statistic_switch_today"
-            android:textSize="10sp"
-            tools:ignore="SmallSp" />
-        <RadioButton
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:text="@string/statistic_switch_week"
-            android:textSize="10sp"
-            tools:ignore="SmallSp" />
-        <RadioButton
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:text="@string/statistic_switch_year"
-            android:textSize="10sp"
-            tools:ignore="SmallSp" />
-    </RadioGroup>
-
+        app:layout_constraintStart_toStartOf="parent" />
 
     <RadioGroup
         android:layout_width="wrap_content"

diff --git a/app/src/main/res/layout/activity_statistic_week.xml b/app/src/main/res/layout/activity_statistic_week.xml
@@ -13,12 +13,12 @@
         android:id="@+id/textViewWeekTop"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="580dp"
+        android:layout_marginTop="24dp"
         android:text="@string/statistic_week_title"
         android:textSize="25sp"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"  />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <com.github.mikephil.charting.charts.BarChart
         android:id="@+id/weekBar"
@@ -49,32 +49,33 @@
     <RadioGroup
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="5dp"
+        android:layout_marginTop="50dp"
+        android:layout_marginEnd="8dp"
         app:layout_constraintBottom_toTopOf="@+id/weekBar"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textViewWeekTop"
         tools:ignore="MissingConstraints">
 
         <RadioButton
+            android:id="@+id/week_day"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:text="@string/statistic_switch_today"
-            android:id="@+id/week_day"
             android:textSize="16sp" />
 
         <RadioButton
+            android:id="@+id/week_week"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:text="@string/statistic_switch_week"
             android:checked="true"
-            android:id="@+id/week_week"
+            android:text="@string/statistic_switch_week"
             android:textSize="16sp" />
 
         <RadioButton
+            android:id="@+id/week_year"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:text="@string/statistic_switch_year"
-            android:id="@+id/week_year"
             android:textSize="16sp" />
     </RadioGroup>